Autogenerated HTML docs for v1.5.6.1-156-ge903b
diff --git a/git-merge.html b/git-merge.html index 68420e3..12b4a4c 100644 --- a/git-merge.html +++ b/git-merge.html
@@ -273,9 +273,9 @@ <h2>SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<div class="content"><em>git-merge</em> [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]… +<div class="content"><em>git merge</em> [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]… [-m <msg>] <remote> <remote>… -<em>git-merge</em> <msg> HEAD <remote>…</div></div> +<em>git merge</em> <msg> HEAD <remote>…</div></div> </div> <h2>DESCRIPTION</h2> <div class="sectionbody"> @@ -507,8 +507,7 @@ </dd> </dl> <p>If you tried a merge which resulted in a complex conflicts and -would want to start over, you can recover with -<a href="git-reset.html">git-reset(1)</a>.</p> +would want to start over, you can recover with <tt>git-reset</tt>.</p> </div> <h2>CONFIGURATION</h2> <div class="sectionbody"> @@ -600,7 +599,7 @@ <dd> <p> Sets default options for merging into branch <name>. The syntax and - supported options are equal to that of git-merge, but option values + supported options are equal to that of <tt>git-merge</tt>, but option values containing whitespace characters are currently not supported. </p> </dd> @@ -612,7 +611,7 @@ commits (usually, branch head or tag), and the index file must exactly match the tree of <tt>HEAD</tt> commit (i.e. the contents of the last commit) when -it happens. In other words, <tt>git-diff --cached HEAD</tt> must +it happens. In other words, <tt>git diff --cached HEAD</tt> must report no changes.</p> <div class="admonitionblock"> <table><tr> @@ -704,7 +703,7 @@ For conflicting paths, the index file records up to three versions; stage1 stores the version from the common ancestor, stage2 from <tt>HEAD</tt>, and stage3 from the remote branch (you - can inspect the stages with <tt>git-ls-files -u</tt>). The working + can inspect the stages with <tt>git ls-files -u</tt>). The working tree files have the result of "merge" program; i.e. 3-way merge result with familiar conflict markers <tt><<< === >>></tt>. </p> @@ -730,8 +729,8 @@ </li> <li> <p> -Resolve the conflicts. <tt>git-diff</tt> would report only the - conflicting paths because of the above 2. and 3.. Edit the +Resolve the conflicts. <tt>git diff</tt> would report only the + conflicting paths because of the above 2. and 3. Edit the working tree files into a desirable shape, <tt>git-add</tt> or <tt>git-rm</tt> them, to make the index file contain what the merge result should be, and run <tt>git-commit</tt> to commit the result. @@ -742,7 +741,11 @@ <h2>SEE ALSO</h2> <div class="sectionbody"> <p><a href="git-fmt-merge-msg.html">git-fmt-merge-msg(1)</a>, <a href="git-pull.html">git-pull(1)</a>, -<a href="gitattributes.html">gitattributes(5)</a></p> +<a href="gitattributes.html">gitattributes(5)</a>, +<a href="git-reset.html">git-reset(1)</a>, +<a href="git-diff.html">git-diff(1)</a>, <a href="git-ls-files.html">git-ls-files(1)</a>, +<a href="git-add.html">git-add(1)</a>, <a href="git-rm.html">git-rm(1)</a>, +<a href="git-mergetool.html">git-mergetool(1)</a></p> </div> <h2>Author</h2> <div class="sectionbody"> @@ -758,7 +761,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 08-Jun-2008 22:46:48 UTC +Last updated 02-Jul-2008 03:01:53 UTC </div> </div> </body>
